(perform-replace): Don't clear NODENT when computing the replacement string.
authorRichard M. Stallman <rms@gnu.org>
Fri, 12 Jan 2007 22:32:46 +0000 (22:32 +0000)
committerRichard M. Stallman <rms@gnu.org>
Fri, 12 Jan 2007 22:32:46 +0000 (22:32 +0000)
lisp/replace.el

index c51985c3e4aa53df4b22942766b428236e093ddb..0e1435824e17cf24100c46be8445d69187bf86c7 100644 (file)
@@ -1406,6 +1406,8 @@ make, or the user didn't cancel the call."
        (search-string from-string)
        (real-match-data nil)           ; the match data for the current match
        (next-replacement nil)
+       ;; This is non-nil if we know there is nothing for the user
+       ;; to edit in the replacement.
        (noedit nil)
        (keep-going t)
        (stack nil)
@@ -1517,8 +1519,7 @@ make, or the user didn't cancel the call."
              (set-match-data real-match-data)
              (setq next-replacement
                    (funcall (car replacements) (cdr replacements)
-                            replace-count)
-                   noedit nil))
+                            replace-count) nil))
            (if (not query-flag)
                (let ((inhibit-read-only
                       query-replace-skip-read-only))